Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 22 Jun 2010 00:22:23 +0000 (00:22 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 22 Jun 2010 00:22:23 +0000 (00:22 +0000)
commit94c73a71555687b12e46780f95164b5df30c5491
tree56b0dabd5fab59ea18597e74abcc19fa4472599a
parent8c5ebf6a373cb8292c9ddbbd6cc03f7d11c1fbf3
parentb8cd0112b0f088ed9ec63f1c7b84d6138a94a0b7
Merge from mainline.